Edit lisp/ChangeLog

diff --cc lisp/ChangeLog
index abba8cf2e60286d0aafcec180f859d0690309dc2,abba8cf2e60286d0aafcec180f859d0690309dc2..7070214aa325f0a7b31b424380ac1c5fd62a179e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,3 -1,3 +1,8 @@@
++2011-11-03  Alan Mackenzie  <acm@muc.de>
++
++      * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for
++      change in cc-engine.el.
++
  2011-11-02  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * window.el (switch-to-buffer): Use `force-same-window' interactively.
@@@ -136,7 -136,7 +141,6 @@@
  
        * progmodes/cc-langs.el (c-defun-tactic): Move this variable to
        cc-vars.el.
--      (c-nonlabel-token-2-key): New variable for change in cc-engine.el.
  
        * progmodes/cc-engine.el (c-beginning-of-statement-1):
        Prevent "class foo : bar" being spuriously recognized as a label.